Revision: baz--resolve--1.2--patch-14
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Wed Feb  2 03:32:58 EST 2005
Standard-date: 2005-02-02 08:32:58 GMT
Modified-files: libarch/conflict-handling.c
    libarch/conflict-handling.h tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-14
Summary: Now it really works, and the test cases prove it
Keywords: 

